From 40e938376b55fc05c973b064bf35fa3a225881be Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Wed, 31 May 2023 18:21:10 -0700
Subject: android: audio_core: Avoid shutdown hang.

---
 src/audio_core/sink/sink_stream.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/audio_core/sink/sink_stream.cpp b/src/audio_core/sink/sink_stream.cpp
index 2331aaff9..b408fca89 100644
--- a/src/audio_core/sink/sink_stream.cpp
+++ b/src/audio_core/sink/sink_stream.cpp
@@ -273,9 +273,12 @@ void SinkStream::WaitFreeSpace() {
     std::unique_lock lk{release_mutex};
     release_cv.wait_for(lk, std::chrono::milliseconds(5),
                         [this]() { return queued_buffers < max_queue_size; });
+#ifndef ANDROID
+    // This wait can cause a problematic shutdown hang on Android.
     if (queued_buffers > max_queue_size + 3) {
         release_cv.wait(lk, [this]() { return queued_buffers < max_queue_size; });
     }
+#endif
 }
 
 } // namespace AudioCore::Sink
-- 
cgit v1.2.3